contrail
Compare Revisions
- This comparison shows the changes necessary to convert path
- /branches @ 2413
- → /branches/ @ 2418
- ↔ Reverse comparison
Ignore whitespace Rev 2413 → Rev 2418
| /branches/conpaas_v2/scripts/create_vm/opennebula-create-new-vm-image |
|---|
| 203,11 → 203,12 |
| DEBIAN_FRONTEND=noninteractive apt-get -y --force-yes --no-install-recommends --no-upgrade \ |
| install openssh-server \ |
| python python-pycurl python-cheetah nginx \ |
| tomcat6-user memcached \ |
| tomcat6-user memcached mysql-server \ |
| make gcc g++ sun-java6-jdk erlang ant libxslt1-dev yaws subversion |
| update-rc.d -f memcached remove |
| update-rc.d -f nginx remove |
| update-rc.d -f yaws remove |
| update-rc.d -f mysql remove |
| # add dotdeb repo for php fpm |
| echo "deb http://packages.dotdeb.org stable all" >> /etc/apt/sources.list |
| 216,9 → 217,8 |
| apt-get -f -y --no-install-recommends --no-upgrade install php5-fpm php5-curl \ |
| php5-mcrypt php5-mysql php5-odbc \ |
| php5-pgsql php5-sqlite php5-sybase php5-xmlrpc php5-xsl \ |
| php5-adodb php5-memcache mysql-server python-mysqldb |
| php5-adodb php5-memcache python-mysqldb |
| update-rc.d -f php5-fpm remove |
| update-rc.d -f mysql remove |
| # remove dotdeb repo |
| sed --in-place 's%deb http://packages.dotdeb.org stable all%%' /etc/apt/sources.list |
| /branches/conpaas_v2/src/conpaas/services/mysql/manager/manager.py |
|---|
| 85,6 → 85,9 |
| #TODO: Get any existing configuration (if the service was stopped and restarted) |
| self.logger.debug('do_startup: Going to request one new node') |
| #TODO: who generates the password? The frontend or te manager? |
| self.controller.update_context(dict(mysql_username='root', \ |
| mysql_password='R00T')) |
| try: |
| node_instances = self.controller.create_nodes(1, |
| client.check_agent_process, self.config.AGENT_PORT) |
| /branches/conpaas_v2/src/conpaas/services/mysql/agent/role.py |
|---|
| 229,6 → 229,9 |
| #if dump != None: |
| # self.load_dump(dump) |
| # Change root password - not set as installation |
| os.system("mysqladmin -u root password " + self.conn_password) |
| '''Before creating a data snapshot or starting |
| the replication process, you should record the |
| position of the binary log on the master. You will |
| 350,6 → 353,9 |
| # Start the replication slave |
| self.start() |
| # Change root password - not set as installation |
| os.system("mysqladmin -u root password " + self.conn_password) |
| # Configure it as a slave |
| db = MySQLdb.connect(self.conn_location, self.conn_username, self.conn_password) |
| exc = db.cursor() |
| /branches/conpaas_v2/src/conpaas/core/controller.py |
|---|
| 192,7 → 192,7 |
| #===========================================================================# |
| # generate_context(self, service_name, replace, cloud) # |
| #===========================================================================# |
| def generate_context(self, service_name, cloud = None): |
| def generate_context(self, service_name, cloud = None, ip_whitelist = None): |
| """Generates the contextualization file for the default/given cloud. |
| @param cloud (Optional) If specified, the context will be generated |
| 207,7 → 207,8 |
| c = cloud |
| else: |
| c = self.__default_cloud |
| contxt = self._get_context_file(service_name, c.get_cloud_type()) |
| contxt = self._get_context_file(service_name, \ |
| c.get_cloud_type()) |
| c.set_context_template(contxt) |
| #===========================================================================# |
| /branches/conpaas_v2/config/agent/mysql-agent.cfg |
|---|
| 2,9 → 2,9 |
| [MySQL_root_connection] |
| location=localhost |
| #TODO: Fill in by the manager |
| username=root |
| password=R00T |
| # Filled in by the manager |
| username=$mysql_username |
| password=$mysql_password |
| [MySQL_configuration] |
| my_cnf_file=/etc/mysql/my.cnf |