From f85c84133c2f8d6aec3c707cfb92cb03db543bd6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 May 2017 12:12:15 +0400 Subject: [mcp] Replace reclass system models with submodule Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk --- .../classes/system/salt/master/formula/git/ccp.yml | 10 -- .../system/salt/master/formula/git/foundation.yml | 56 ---------- .../system/salt/master/formula/git/kubernetes.yml | 22 ---- .../system/salt/master/formula/git/monitoring.yml | 14 --- .../system/salt/master/formula/git/openstack.yml | 122 --------------------- .../classes/system/salt/master/formula/git/oss.yml | 26 ----- .../system/salt/master/formula/git/saltstack.yml | 49 --------- .../system/salt/master/formula/git/stacklight.yml | 83 -------------- 8 files changed, 382 deletions(-) delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/ccp.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/foundation.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/openstack.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/oss.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml delete mode 100644 mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml (limited to 'mcp/reclass/classes/system/salt/master/formula/git') diff --git a/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml b/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml deleted file mode 100644 index c8f1c65bb..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - ccp: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ccp.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml b/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml deleted file mode 100644 index 7e21699f8..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml +++ /dev/null @@ -1,56 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - aptly: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-aptly.git' - revision: ${_param:salt_master_environment_revision} - bind: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-bind.git' - revision: ${_param:salt_master_environment_revision} - gerrit: - module: - gerrit.py: - enabled: true - state: - gerrit.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-gerrit.git' - revision: ${_param:salt_master_environment_revision} - jenkins: - module: - jenkins_common.py: - enabled: true - state: - jenkins_credential.py: - enabled: true - jenkins_job.py: - enabled: true - jenkins_lib.py: - enabled: true - jenkins_node.py: - enabled: true - jenkins_plugin.py: - enabled: true - jenkins_security.py: - enabled: true - jenkins_slack.py: - enabled: true - jenkins_smtp.py: - enabled: true - jenkins_user.py: - enabled: true - jenkins_view.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-jenkins.git' - revision: ${_param:salt_master_environment_revision} - openldap: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-openldap.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml b/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml deleted file mode 100644 index fe8ad5dab..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - kubernetes: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-kubernetes.git' - revision: ${_param:salt_master_environment_revision} - etcd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-etcd.git' - revision: ${_param:salt_master_environment_revision} - bird: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-bird.git' - revision: ${_param:salt_master_environment_revision} - docker: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-docker.git' - revision: ${_param:salt_master_environment_revision} \ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml b/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml deleted file mode 100644 index e0cf30df1..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - prometheus: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-prometheus.git' - revision: ${_param:salt_master_environment_revision} - telegraf: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-telegraf.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml b/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml deleted file mode 100644 index 36ddfc29b..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml +++ /dev/null @@ -1,122 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - aodh: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git' - revision: ${_param:salt_master_environment_revision} - #avinetworks: - # source: git - # address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git' - # revision: ${_param:salt_master_environment_revision} - billometer: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git' - revision: ${_param:salt_master_environment_revision} - ceilometer: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ceilometer.git' - revision: ${_param:salt_master_environment_revision} - ceph: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git' - revision: ${_param:salt_master_environment_revision} - cinder: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-cinder.git' - revision: ${_param:salt_master_environment_revision} - designate: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-designate.git' - revision: ${_param:salt_master_environment_revision} - galera: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-galera.git' - revision: ${_param:salt_master_environment_revision} - glance: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-glance.git' - revision: ${_param:salt_master_environment_revision} - glusterfs: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-glusterfs.git' - revision: ${_param:salt_master_environment_revision} - haproxy: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-haproxy.git' - revision: ${_param:salt_master_environment_revision} - heat: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-heat.git' - revision: ${_param:salt_master_environment_revision} - horizon: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-horizon.git' - revision: ${_param:salt_master_environment_revision} - keepalived: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-keepalived.git' - revision: ${_param:salt_master_environment_revision} - keystone: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-keystone.git' - revision: ${_param:salt_master_environment_revision} - memcached: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-memcached.git' - revision: ${_param:salt_master_environment_revision} - mongodb: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-mongodb.git' - revision: ${_param:salt_master_environment_revision} - mysql: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-mysql.git' - revision: ${_param:salt_master_environment_revision} - murano: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-murano.git' - revision: ${_param:salt_master_environment_revision} - neutron: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-neutron.git' - revision: ${_param:salt_master_environment_revision} - nginx: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nginx.git' - revision: ${_param:salt_master_environment_revision} - nova: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nova.git' - revision: ${_param:salt_master_environment_revision} - opencontrail: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git' - revision: ${_param:salt_master_environment_revision} - python: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-python.git' - revision: ${_param:salt_master_environment_revision} - rabbitmq: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git' - revision: ${_param:salt_master_environment_revision} - sahara: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sahara.git' - revision: ${_param:salt_master_environment_revision} - statsd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-statsd.git' - revision: ${_param:salt_master_environment_revision} - supervisor: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-supervisor.git' - revision: ${_param:salt_master_environment_revision} - swift: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-swift.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/oss.yml b/mcp/reclass/classes/system/salt/master/formula/git/oss.yml deleted file mode 100644 index e9273873a..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/oss.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - _param: - salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas - salt_master_oss_revision: master - salt: - master: - environment: - dev: - formula: - devops_portal: - module: - devops_utils.py: - enabled: true - source: git - address: '${_param:salt_master_oss_repository}/devops-portal.git' - revision: ${_param:salt_master_oss_revision} - rundeck: - module: - rundeck.py: - enabled: true - state: - rundeck_project.py: - enabled: true - source: git - address: '${_param:salt_master_oss_repository}/rundeck.git' - revision: ${_param:salt_master_oss_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml b/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml deleted file mode 100644 index d0ca4535a..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml +++ /dev/null @@ -1,49 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - backupninja: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-backupninja.git' - revision: ${_param:salt_master_environment_revision} - git: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-git.git' - revision: ${_param:salt_master_environment_revision} - iptables: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-iptables.git' - revision: ${_param:salt_master_environment_revision} - libvirt: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-libvirt.git' - revision: ${_param:salt_master_environment_revision} - linux: - module: - linux_netlink.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-linux.git' - revision: ${_param:salt_master_environment_revision} - ntp: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ntp.git' - revision: ${_param:salt_master_environment_revision} - openssh: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-openssh.git' - revision: ${_param:salt_master_environment_revision} - reclass: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-reclass.git' - revision: ${_param:salt_master_environment_revision} - salt: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-salt.git' - revision: ${_param:salt_master_environment_revision} - sphinx: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sphinx.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml b/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml deleted file mode 100644 index ed07d827e..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml +++ /dev/null @@ -1,83 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - apache: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-apache.git' - revision: ${_param:salt_master_environment_revision} - collectd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-collectd.git' - revision: ${_param:salt_master_environment_revision} - elasticsearch: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-elasticsearch.git' - revision: ${_param:salt_master_environment_revision} - grafana: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-grafana.git' - revision: ${_param:salt_master_environment_revision} - state: - grafana3_datasource.py: - enabled: true - grafana3_dashboard.py: - enabled: true - graphite: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-graphite.git' - revision: ${_param:salt_master_environment_revision} - heka: - module: - heka_alarming.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-heka.git' - revision: ${_param:salt_master_environment_revision} - influxdb: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-influxdb.git' - revision: ${_param:salt_master_environment_revision} - java: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-java.git' - revision: ${_param:salt_master_environment_revision} - kibana: - state: - kibana_object.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-kibana.git' - revision: ${_param:salt_master_environment_revision} - nagios: - module: - nagios_alarming.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nagios.git' - revision: ${_param:salt_master_environment_revision} - postgresql: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-postgresql.git' - revision: ${_param:salt_master_environment_revision} - rabbitmq: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git' - revision: ${_param:salt_master_environment_revision} - redis: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-redis.git' - revision: ${_param:salt_master_environment_revision} - rsyslog: - module: - rsyslog_util.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rsyslog.git' - revision: ${_param:salt_master_environment_revision} - sensu: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sensu.git' - revision: ${_param:salt_master_environment_revision} -- cgit 1.2.3-korg